projects
/
gpsbabel.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
25f7696
)
fix gui usage of duplicate filter. (#695)
author
tsteven4
<13596209+tsteven4@users.noreply.github.com>
Sun, 14 Feb 2021 20:36:57 +0000
(13:36 -0700)
committer
GitHub
<noreply@github.com>
Sun, 14 Feb 2021 20:36:57 +0000
(13:36 -0700)
the shortname and location options are not exclusive.
this resolves #686.
gui/filterdata.cc
patch
|
blob
|
history
diff --git
a/gui/filterdata.cc
b/gui/filterdata.cc
index 59f40b14f0b0680bc13333f400d4cfa152a4944f..3c4d6715c52b2748bb38b35eea41824450157c2a 100644
(file)
--- a/
gui/filterdata.cc
+++ b/
gui/filterdata.cc
@@
-35,7
+35,7
@@
QStringList WayPtsFilterData::makeOptionString()
args << QString("radius,distance=%1%2,lat=%3,lon=%4")
.arg(radiusVal).arg("MK"[radiusUnit]).arg(latVal, 0, 'f', 8).arg(longVal, 0, 'f', 8);
}
- if (duplicates && (
(shortNames ^ locations) != 0
)) {
+ if (duplicates && (
shortNames || locations
)) {
args << QString("-x");
QString s = "duplicate";
if (shortNames) {